Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 29 Mar 2010 10:23:03 +0000 (10:23 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 29 Mar 2010 10:23:03 +0000 (10:23 +0000)

Trivial merge